(command-line): If initial X frame has a menu bar, mark menu-bar-mode as on.

diff --git a/lisp/startup.el b/lisp/startup.el
index 6b646eed849b619f2e2cd65f351b578f21b10099..4de390c44a53e97a640d971664b1477f31b2c5a8 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -313,6 +313,10 @@ specified by the LC_ALL, LC_CTYPE and LANG environment variables.")
       (face-initialize))
   (if (fboundp 'frame-initialize)
       (frame-initialize))
+  ;; If frame was created with a menu bar, set menu-bar-mode on.
+  (if (and (eq window-system 'x)
+          (> (cdr (assq 'menu-bar-lines (frame-parameters))) 0))
+      (menu-bar-mode t))
 
   (run-hooks 'before-init-hook)